Explicitly set KEEP_SYSTEM_SERVICES to include lightdm
on fatclients as well (keeping lightdm is the default,
but it has been explicitly on those other hosttypes
that need it as well).  A few stylistic changes as well.