Fixup for 3abe3d0f
Fixup for ccf13e4e
Split commands file into two subsections: regular/special commands