Cleanups and unary plus is now supported.