Avoid double-wrapping expressions