Minor fixes to support inclusion criteria for attribute-backed props