Introduced a third phase in blueprint building, fix #1659.
Further refinements in builder processing.