Prevent things that shouldn't be wrapped being wrappeded and add HandlerExistsFor to allow determination as to whether annotation should be added for secondary spurs on flow control changes