PATCH: gcc4 alias fixes