Refactored require all. Normal searches can parse macros.