Cleaned up handling of cmd checks in TaskBuilder.