Static imports where appropriate

The name of the PR says it all.

Stopping for now to allow merge.