Dry up Facade very slightly
Merge pull request #4284 from Anahkiasen/dry-facade

Dry up Facade very slightly