Optimize imports with no globs; fix block count calculation, spacing, and other minor CR changes.