Instead of this special-casing, take an optional class_name argument. Might turn out useful for other people.