Removed expr() function -- not worth the effort.
Added top-level namespace references.