Re-factored compat to provide clear locations for dependency compatibility code