Small simplifications & fixes.