Work in progress -- still working on normalizing declarations.