Merge pull request #2178 from billhollings/arg-buff-fixes

Fix argument buffer padding when content includes arrays.