Increase efficiency of SAN generation / disambiguation