Merge, plus improvements to the custom fill_out stuff.