Made the -export's more consistent.
Made initialization easier for handlers.