Trim down some aliases