Linearize bodyaux parsing. No functional changes.