Simplify decorator logic, thanks @halst!