Some tweaks to debugging code to make it saner to splash in as needed.