#16: Improve definition of DocComment and object