Two small bugs.

1. Scalars in condlist weren't handled. Arguably, they shouldn't be used anyway, since they're useless, but supported now nonetheless.

2. Typo in broadcast_arrays for condlists.

Added a test to pick up both of these.