Modifications required to support variant functions.
mMerge branch 'batcheddirectedmutations' of https://github.com/zeminlu/comitaco into batcheddirectedmutations