Make the button delete highlighting functions a little more generic