Arguments, phase 3 of 3 -- some cleanup is necessary and the taxonomy argument content type still to come