Updated to reflect changes in the Format lib.