Fixes some deprecated imports

Part of the compiler was moved to reflect during 2.10, with compatibility support in the old locations. Some of this compatibility support was removed a few days ago, so we need to update too.