Part 8: Apply generator filtering to actions. Remove duplicate code between old and new rebind