FIX: routines were not honoring the `store-bodies?` compilation flag.