More cleanups to Setting/Argument type handling, mostly for count != 1.