Those concerns are valid but the code was like that in the original so we should merge this patch as is and hope some volunteer will fix things up in a follow on patch.
Fixing them in this patch would be a mistake anyway because of the one thing per patch rule.