Finished rewrite down to Constants section.