Reduce the impact of hidden dependencies on BundleConfiguration and Constants.shared Fixes #656
Fixes #619
Closes #611