Fix 8167 (identity constructor) and 9061 (bitwise ops)