Fixed aliasing violations properly--these were no longer needed