vim: replace echo\nreturn with trhow in a few places