Make all encryption arguments explicit