First cut at removing prefix handling through defaults.