Make dspec more OO.