Merge parser modules and optimization tweak for bucket name parsing