Minor cleanup; initial org matcher.