Modified default sample size in query.trait.data functions

take.samples() had different default (10^6) than derive.trait()
and derive.traits() (10000). In addition, only the former was ever used.
Cleaned up to avoid future confusion.