Make zero/one nodes optional (especially for testing)