Fix up enforcing types.