s2s: turn some comments into code