Cleaner metric target construction.