Merge "Detect bad behavior earlier in Choreographer." into jb-dev