Move body type function back to header parser (Gets called fewer times)