Some cleanup in ButtonLayer::draw().