Handle upcall initialization in a sane manner.

Clean up the upcall receive pipeline
Working