Look over changes from https://github.com/RhysU/c99sh/pull/31 to see if they can be tightened up some.