Closes #713. And minor tweaks and tests for 'subset' argument.