Fix postfix/prefix vs. button-groups war, see #1677 and f24c3077049afc4522401cd38218215d4bdc50e7
updated to fix conflicts