Move prompt stuff back into precmd