Fixed bug where e.g. @"1" and @(1) could be different instances