Improve consumption of primitive types as body

Improve consumption of primitive types as body #4002