consistently delegate using stmt -> {}

consistently delegate using stmt -> {} #1529