Some clean up after #60.
0.4.6