* Redo semantic substitutions by @ipaaa