Comment cleanup, see #56.