Fix static definition madness: Part 2

Forgot to commit those.