Streamline debugging infrastructure even more