Cleaned up the Server push functionality, getting ready to implement
major changes.