Update to use HTableInterface where appropriate.