Loosen dependency on more_core_extensions