Fix broken return-statements for preserve_line and extend with no_empty_line