Fixes #307: Remove remaining uses of is_command;