More control over select clause

As discussed in #374.