Remove some const_cast's

Remove two more instances of const_cast in code that accesses the product registry.  This makes it easier to tell where the product registry is modified, which is important for the multithreaded framework.