Improve data declaration parsing.