More no-op refactoring
Some fixes where refactoring wasn't completely applied