Properly preserve empty +A channels.