Added initial Builder support and a couple miscellaneous improvements.