Fixes T6787. I'm kind of cheating a little bit here by not unifying default selection with initializeNew(...) methods, but I figure we can let this settle for a bit and then go do that later. It's pretty minor.
Since we're not doing templates I kind of want to swap the 'template' key to 'type' so maybe I'll do that too at some point.
@chad, freel free to change these, I was just trying to make them pretty obvious. I do think it's good for them to stand out, but my approach is probably a bit inconsistent/heavy-handed in the new design.