Address feedback from #189 and fix #191.

It was merged before I got to fix these issues :P

Closes #191.