make staging directives more backward compatible.

Mark, can you please review?