Small bug fixes

- waitFor does not need the continuation to be Maybe-like
- if we failed to provide a solution, any match is better