[WIP] Apply, pack, and arg passing fixes