Slightly smarter targets for less typing