Updated non-variadic emulations. Added non-variadic build test.