Fix call order to be the same as definition order

Fills strange to have the order be arbitrary here. Order them the same.