Further DCA parser improvements