Can yu get rid of the elv_rqhash in favour of these new ones instead of having that tinty indirection? Also the new helper should have some prefix - either keep elv_ or add blk_.