Merge "Remove 'break's to make sure we see all options."