What do you think of defaulting to 1?
I think it'd be better not to start changing default behavior with this patch

Otherwise looks good