Minor declarative API improvement (#7749)

Change-Id: Id5b11b27e7750085d30d2fa592b124ae474d6e9a