Refactor CustomCommand substitution processing to improve quality of validation
Fixed compile errors & moved player/args in CustomCommand to class members
Fixed compile errors