Fixed a Redeclaration Screwup in the Last Commit