Use uniform chain special case more often