Minor internal API improvement