Explicit import instead of *, plus minor fixes.