[Changed] Moved util/wrapper/const loading to be first
[Changed] Removed wrapper function, and changed any files that use it.