Fixes issue in http://code.google.com/p/cbecc/issues/detail?id=394 along with several other bugs