A little cleanup that should help !8869 (merged) be a little smaller.
merged
mentioned in commit 4c0d7104