Various tweaks related to implementation of the new t, n. and c command-line switches.