A couple tweaks for #577.