#57 rewrite blob fixup code so that we can easily create new variants