Split into command and browser versions.