Minor: less obscure declaration order