Cleanups to fix #40.