Simplify arg handling, remove unnecessary extra vars