haiku: Clean up code, use target-helpers

* Thanks for the help xexaxo!