Tweak 'use' statements