Semantic refactoring concerns addressed and changed where needed.