The convention is to use cls for first parameter in classmethods
Put braces in new lines for consistency

It is easier to do on our own than trying to pick evernote/pootle@23f9fce2.
Don't expose deprecated fields on the API

This might help dropping these fields without having to worry about letting
references to them behind.
Pass the parameters in the right order