Move 'static' qualifier before 'const' in a couple of places. I didn't know it mattered, but gcc warns.