Do a better job of const and static
Remove 'PHIL' from debug stmts