Clean up some TODOs in hhbctranslator