Better defaults for BreakCommand and follow the contract more