[PATCH] auxiliary vector cleanups