Fix up some minor issues in the base types formatter