Added a little bit more, though it's not publicly exported.