Merge branch 'rj/prune-packed-excess-args'