More empty comment removal; fix #16