Compound expressions

Add compound expressions, some cleanups.