Some minor cleanup for 0.3.7.