allow contextual right-side in links and inclusions+solution

Now you can use _self or _whole this way, and you can also just end the inclusion with with a +.