More work on the declarations parser