Add a common expression type
Fix handling of common expressions