Simplifying and robustifying the decorators for matching