Make with-type disarm/arm the body expressions.

Closes PR 14587.