this change is less readable

I'll stop now... there a bunch more changes here appear to be directly related to the removal of hc3 which reduce the readability of the source code.