Make r66504 a little more concise