Adjustments to meet N3721 requirements for when_*

See Issue #794

Signed-off-by: K-ballo <k@fusionfenix.com>
Added error_code support to when_*

Signed-off-by: K-ballo <k@fusionfenix.com>