More micro-tweaking of Button callback behaviour.