Several refactorings around RunType enum.