bug 1105074 - make more stuff final r=froydnj