Re #1257 Renaming 'object' to 'self'.