Modernized code to comply with Harmony.