Still adding non-root user logic.

Some unrelated improvements to maintainer-scripts (mainly style).