Cleanups after #42