Core/Conversion: Some work on handlers.