fix splats in calling context bugs after implementation change

Tests are now passing!