Refactor declaration parsing to handle storage classes better