buttonMarkup: Code readability improvement and de-lint. Also, an excuse to mention perf results.

http://jsperf.com/buttonmarkup-master-vs-next/2