Rename lifetime parameters to 't
Make the same interface for all parser functions