Rejig some lib things.