Bashism removal take 2

Removed some bashisms that crept in since my last crusade.