Fix parameter identification in data declarations
Fixes issue #259