Styling: add expression classes, make sub a proper expression