Allow nested control fields to work within the same module
Add support for 64-bit integers in C++ wrappers