Tweaks

[willrogers]

@mfurseman any comments?

[coveralls]

Coverage increased (+0.1%) to 93.611% when pulling 97066ac on tweaks into 7ab5088 on master.

[coveralls]

Coverage decreased (-0.2%) to 93.258% when pulling f7cf600 on tweaks into 7ab5088 on master.

[coveralls]

Coverage decreased (-0.2%) to 93.258% when pulling 9f39c87 on tweaks into 7ab5088 on master.

[coveralls]

Coverage decreased (-0.2%) to 93.258% when pulling 095cf11 on tweaks into 7ab5088 on master.

[coveralls]

Coverage decreased (-0.2%) to 93.258% when pulling 095cf11 on tweaks into 7ab5088 on master.

[coveralls]

Coverage decreased (-0.2%) to 93.258% when pulling 095cf11 on tweaks into 7ab5088 on master.

[mfurseman]

This seems to address all the niggles I came across refactoring pml.