Bhaskar cleanups

@maddalab take 2. @Primer42 

Obsoletes https://github.com/tumblr/collins/pull/176