Cleaning up so it compiles on new import.