Minor tweaks to improve Scrutinizer score and start fixing non-display
of "Imports cleared successfully" text.