Ever-so-light code cleanup.