Cleaning up arg-processing.