Change the return type of table(). Review by @mglukhovsky over the shoulder. Related to #540