Mostly fix the animated change of constraints outside of animation block. Also a couple small cleanups.