More progress towards full argument types.

Note to past self: I am *very glad* to have some amount of regression testing when making these kinds of changes.