Cleanup re  Bug 318084 -  [compiler] cannot callin-bind a callout-defined method
mainly: removing/renaming states.
7 files changed