Made convenience scripts more flexible with regards to arguments.