Speeding up extract_collapse_mask() slightly
Fix surround encoding

Broken by 306d7f5a308e30ce10ba1a1dcdbeeb81de3b2872
Speeding up ec_tell_frac()