Builder: Rewrite optimal fill