Prepare for life-debugging, minor cleanup too