New arguments system is (mostly) working.