Merge pull request #1 from otherinbox/rm/assume_less

Make fewer assumptions about how this code will be used.