Remove unneeded config macros; Fix ser configuration.