Make variant/enum mapping more safer

[mt-caret]

Available macros in ocaml_interop are quite basic, so we need to resort to expand the macros out and mess around with them to get behavior we want. This makes it much easier to make mistakes and was the source of one correctness issue. Perhaps we should have a macro that has a bit more flexibility (and also consider upstreaming).