Improved register/remove outputs.