Reorder and simplify the logic for determining how we deliver
the body (if at all)
Move Range: processing to its own source file