Log Message:
The "+" constraint modifier was yoo much. While it seems correct to me, it
caused gcc complaints in some cases. Pointed out by Nicolas Joly.
PR pkg/28882 should be fixed now.