CSPACE-6273: Tweak resource ordering under Debian-based OSes. Minor style cleanup.