HEq: Reorder members (to rebase)

As suggested by @Toxaris.
Also fixup comment.