Since this is now public, we probably will want to reconsider which innards are private members. Otherwise, it is distracting to see them.