Closes #7 (closed), closes #8 (closed). Also slightly modifies the semantics of AreaQueryElementwiseTemplate.