Bugfix in call stack construction
Updated code to work with latest CBMC
Fixed code no longer accepted by XCode 5.0 Clang