simplify signature of MSA

now that QuerySource isn't defined in multiple places (I changed
MSA's previously inner version to QueryTaskSource), it can be
simplified