Revert "Attempt at simpler wrappers. Still seems to work somehow."

This reverts commit 1c95f909632fe96dd670e49fc5cf1177adc0aac4.
Implemented a wrapper and build/augment for functions that will have static arguments