Pulled up the constant-lookup handling to the BaseConfigSource - working for all three sources