sync with the azores-devel tree to bring in new beam table lookup symmantics