Moving Proto to CLOS structure to simplify some of the dispatch. Partial fix.