Fix the way in which we set defaults
Fix the way in which we set defaults

Apparently having both default and builder set on an attribute is not
allowed, not even if they're not set in the same class.

yoe/sreview,yoe/sreview,yoe/sreview,yoe/sreview