Move properties closer to their definition, to avoid forgotten switch cases