Some minor cleanup after #95