Saner, more elegant incoming comment handling.