Merge branch 'jc/no-cmd-as-subroutine'