WIP: Remove unneeded branch.

TODO: ensure this doesn’t cause a perf regression
Remove unnecessary helper method.
WIP: combine filtering and running hooks.