01-classes improvements

As always, feel free to cherry-pick. Justifications for each commit in its commit message.