Still more tweaking for type.