Simplified creation of builders (should be no visible change).
Simplified creation of builders (should be no visible change).

ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history