Clean up label transitions a bit