#7 Add leading/trailing functionality for delimited parser