Stopped extending claims just for breaks.

Claims still extend on build.  This saves writes to secondary storage
for better performance.