Make ByHand consistent with library definitions