Continuing .bat to .cmd conversion

See previous commit comments.