Fix inline comments breaking meaning of return
Universal handling of inline comments (by skipping them).
Fix string getting indented at start of file.