What about using `-n` and `&&`? Should be straightforward -- isn't it in the stock .bashrc? I can make this change faster than I typed this comment though. Nevermind! :)