Changed a few const to final.