Change UnifyingResolution/SPASSParser

Based on recent comments. However, some of the changes went wrong, and
now it need some repairs