More TypeHandler fiddling.