Implement flexible target specification

See commit message.
Fixed.