Pack-scan changes

non-null default args are trouble prone (though I think this case would work). Best to avoid them if possible.