Update (allow-none) annotations

The annotation has been deprecated in favor of (nullable) and/or
(optional).