A bit more work on #1776