Enhancements to ~alias as per [#95]