Refactor PCI binding code to use "match" instead of if-else sequences

Created by: imp