- Merged common code in function parse_{c,s}method to a single function - Removed duplicate code in transport.c - Fixes #6236