Marginalia-friendly version of #150.