Modified argument parsing after more insight.