Use DEV_TTY more consistently