vp9: some variable re-arrangements for alignment.