r1768: moved high-level types from interface level