i just wrote this assuming there will be a 1.3.2 sometimes after this PR is merged, and that we want to drop the classes in 2.0. we can also do it later, they don't really hurt (except the eyes :-)