Fixups for PR #125

After merging these, we can merge `old_125_branch` into master. :) 

See #125 for references. :)