Removing all useIdx/internalXXX in prep for manual currying
Removing all useIdx/internalXXX in prep for manual currying