Rewrite argument parser