Fix oudated comment, added a couple of "static" declarations.