Minorly correcting poorly-ordered imports