Merge pull request #72 from alexcrichton/tweak-interfaces

Tweak implementation details for upcoming changes