Preparatory changes for one-line logging.