Moves more faye vars to be class vars