> I'll probably just change the comment, if that is OK. If this is all going to turn into elastic search anyway, there doesn't seem much point working something pretty out here.

Replace it with a comment to that effect, and it sounds good to me.