Fixed a common issue that resulted from weird decisions in destination parsing. Will work on a 2.0 that will make this thing actually clean relatively soon.
