Prepend constants, renamed functions, split messages from errors. #2456