Imports w/o globs; fix block count calculation, indents.