Revert "More type fiddling."

This reverts commit 23054f82bef9c626cfc89a23a59d36c68aac1ec2.