Some cleanup to make import clearer.