Improvements on rP25210
See rP25210. Follows comments by @vladislavbelov.
Differential Revision: https://code.wildfiregames.com/D3852