(bug 18855) Consistently call commandLine.inc with how we more or less do it now.