Class expression cleanup

Fixed a warning; looked at the code involved, couldn't restrain myself from some tidying.