More refactoring. Allows for strict matching.