Commit.xs: Reorder variable declaration order