Use readableNames
Don't do tag check on extractor results
Remove case keyword in functions. Change match usage
Fix optimization issue wrt ambiguous cases