Misc: further simplify custom help logic