Miscellaneous index.mako cleanups