Issue #6: got rid of DefBuilder, DefScanner