WYCS: reverting changes to the core solver files because they are obfuscating those important files; instead, I want to apply those optimisations automatically.