Updated to support new ClassName() expressions. Forgot this box wasn't 64 bit...