leave an empty line above and trim the commented suffix...

also, trim any double redundant empty lines below.