Simplifying build even more.