Simplify decorator constraints