Minor cleanups of requirements and code.