Merge "Allow CompositeBlock::appliesToRight to return null when unsure"