If its not causing any tests to fail, lets keep this change. Makes handling of args much easier.