Partial fix for GH#11 for aliases not rewriting