Further fixes to HRON C parser