Fix pluralization and squash require_once.