Tweak composer commands. Closes #1954.