Improvement over the fix above (indent of records containing comments)

comments should'nt interfere with indentation at all in this case
Better indent after keyword 'when'