minor+build: reordering dependencies for better performance.