Improved onion_handlers removal, now compiles.