Minor code simplification.
Simplify Base.pick() to only receive two arguments, as it's never used in any other way so far.
Convert indentation from tabs to white-space.