wraps proposals into with_empty and adds more guards

[ivg]

The proposals (promises with options) now can use the choice monad interface as well as the other promises could do. Also adds a few guards to the existing code to make it more readable and improve performance.