A bit more gitprompt cleanup