Cleaned up code. Fixed out-of-sync templates.

563u, 72i