Alias façade rather than resolved class wherever possible

Closes issue #3