Replaced "from X import *" with explicit imports, in experimental branch.