Improved postulate machinery.