Refined argument parsing