Sigh. Re-add h2o.table changes since Spencer clobbered them, and fix PUB-706.