Improved unary assignment support