Fix stack overflow on x64 with memchecks, darn it

Forgot that they were being called directly.  That was a bad idea in the first place, this is simpler.

-[Unknown]