Remove platform-dependent logic from base Dsl