[HSA-677 Fix] Handle Function Decls Correctly
[Refactor] Update to build cleanly with gcc 4.8