Have new implementation of caml macro basically working now.