Fix alias NPE in CubeRewriter & alias reconstruction in HQLParser