Fix overflow with clz/ctz.  Update test case.