Light refactoring of nancy parameter matching