moving things out of Core into Common that may interfere with making Core a PCL