Remove some >1.9 syntax; fix specs using described_class