This is a (rather delayed) follow up to commit 0129cd50. This commit is entirely NFC, the semantic change to leverage the new information will be submitted separate with a test case.
