Use default or default with extension depending on whether or not extension is present

[moxie]

[elskwid]

@moxie, I like this! I want to keep 1.3 mostly compat with 1.2 and people may be relying on the old behavior. I will add this when I am done with 1.3 and moving towards 2.0.