I, perhaps naively, still prefer your approach in https://reviews.freebsd.org/D37005. However, I may not appreciate valid cases where /usr might not be mounted. This is certainly a step in the right direction.

Doing something like this change (or D37004) now doesn't preclude D37005 from going in later.