Better support for __ checking