Button mixins: simplify. Fixes #14