BL-662, 696 and more format dialog work

I might have been at one time, but then why is it still showing up in a diff with what's on master?