Minor cfg improvements from mtbc/pr-863