Should have unified on lack of "if data" checks.