I guess the || {} can be omitted now?