Reworking library internals...