One more bit of cleanup to render more generic.

Joshua