tighten up unary stuff