* Eliminated some gcc-isms