[AS7-6781] Make non-final constants final; reduce visibility in some cases