s/decoratable?/decorator_class?/, cleaner rewrite