Make various imports less general

This allows code optimizers to work more effectively.
Bump version