Fix: Subdivide imports on a per-module basis, making them finer-grained,
       per Hartmut Goebel's suggestion.