Cleaned up Analysis::ArgumentAmount a bit.