Strip an extra suffix from defaults #243