More body type fixes and assertions.