Involve all bits of hax in haf

Not that this buys us anything, of course, but hey.
Merge branch 'master' into newbreach