Resolve #26: better integer and nat shrinks