Adjust types a little more.