Some cleanups

Somewhat silly to use the FQNs here to begin with...