Cleanup.
Continued replacing path literals with path constants.