Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Alain Schlesser <6c4dc35be34957a40dcf4681df7b2c841266a248@gmail.com>
ampproject/amp-toolbox-php,ampproject/amp-toolbox-php