New argument-wrapping system (tested)