Modified and improved foldmethod configuration mappings