Add coverage and match legacy behavior.