Minor touchup post-merge of #309