v. 0.3.6, contd, handle oneOffs better on recursion