x:was and x:expected fixed in RNG

* RNG: added x:was and made both x:was and x:expected optional
* changed name of c:was and c:expected to x:was and x:expected
* wrapped option context element in p:inline
* removed some logging statements