Expand star imports to minimize namespace conflicts.

Signed-off-by: John May <john.wilkinsonmay@gmail.com>