Minor Refactoring 2: The Refactorening

• Removed remaining wildcard imports

No breaking changes. This is an addendum to the previous release, and only has a couple of changes to areas that were missed previously.