Getting more work done on #512.