Constants should be declared before any properties; restore these to the original location.