Working higher-order contracts.

Optional still doesn't do anything inside HOC's ¯\_(ツ)_/¯