Some \todo updates and remove a few useless 'static' specifiers.