Update Buildscr to use the new 'with' mechanism.