Some cleanups and clarifications.