Fix a couple of Order#is_risky bugs

Fixes #4261
Fixes #4260