Added some common macros and such for the NK internal code.