Minor refactor

This should push hook options without namespace to hooks array, which
should make getHooks work as expected