Deprecated things are no more. Fix some markup.