reflection sync

review @retronym @adriaanm

also see https://docs.google.com/document/d/1GmHRmqahh1tTH_GOPsRlnGVRAFPe-x0iCu3BNMNXjf0/edit