Updates to Body processing. Still lots of work to do around this. Preparing for refactor around handling declarations the right way.