More type tweaks.