Make annotation & caption uploads more uniform.