Cleanup getArguments() a bit