Remove unused inport.
Fix type of matcher.