Standarize fallback behaviour
Remove redundant turf