Bump to 1.12.6 and clean up where possible.