Simplify these to avoid copy/paste errors.

(I'd not changed the originally commented-out code in resource to reflect
the changes in resources since I'd commented them out.)