replaced redundant if-else block in parse_scms with a single block
small alterations made to many analyses to appease the parser