LikeMagic core lib now compiles again.
More refactoring.