This _partially_ reverts fixes already applied by the patch from bug 521861.

Track column numbers and use it with stored information of !< comment
after module variable and subprogram parameter.
Create procedure for new line, where clean prepass comments.