adding support for unit() to expressions