Improve positions of some class definitions.