Clarity improvements, thanks @koden-km [ci skip].