Quick tidy of imports, etc., to keep IDE happy.