Innocuous changes for monkeypatching

I think these are all good changes, but my motives are impure, so thought I'd run them by folks.