Implemented proper handling of static:: constants