Cleanup: Sort and use one var per line in requires.