Change in handling of field declarations

In the case where multiple variables of same type are declared together,
split them up into multiple declarations.