Factored out check macros not present in 0.9.8