better join-line and fixup-whitespace