address @sjcorbett review comments on #46