Blocks with deltas > 29 characters break ESI Blocks, cause PDOException

I get the following error when I enable one of my blocks with ESI integration:

PDOException: SQLSTATE[22001]: String data, right truncated: 1406 Data too long for column 'delta' at row 1: INSERT INTO {block} (module, delta, theme, status, weight, region, pages) VALUES (:db_insert_placeholder_0, :db_insert_placeholder_1, :db_insert_placeholder_2, :db_insert_placeholder_3, :db_insert_placeholder_4, :db_insert_placeholder_5, :db_insert_placeholder_6); Array ( [:db_insert_placeholder_0] => esi_block [:db_insert_placeholder_1] => s17_named_geolocation_user_address [:db_insert_placeholder_2] => mercydotnet [:db_insert_placeholder_3] => 0 [:db_insert_placeholder_4] => 0 [:db_insert_placeholder_5] => -1 [:db_insert_placeholder_6] => ) in drupal_write_record() (line 7170 of /drupal/includes/common.inc).

As you can see, the second placeholder, s17_named_geolocation_user_address, is longer than 32 characters, thus causes the insert query to fail. Since esi_block__new_delta() adds 3-4 new characters to every block delta, and block deltas may already be up to 32 characters, we need more padding in the block delta column (or esi will need to change the way it creates placeholder block names).