Opus support: Initial changes for testing.