I just tagged on in another thread with an update -- this will be addressed in the next Collect release.
In the mean time, you are right that using calculate
s for defaults has to be done very carefully. Read this post for the mental model to have.