Integrate a couple of abbreviations and mush from @rgchris!