Migrated some users of constants to interface values