Simpler aliasing

Fixes #15
Fixes #16