No semis in optional vertical whitespace. Also reverted to things in expr for now.