One more quick readability pass.