Modifications to allow for object decorators.