More type fiddling.