[gh-11] Some additional cleanup.