Made them final now. One less thing for me to track down later.