Autoassignment internals: Moving towards universal upload.

Just refactoring.