update the way register/enqueue is happening to eliminate some "doing_it_wrong" messages