Minor style fixes.
Renamed contains to containsExtendedAttribute to avoid conflicts with
collection method.