Quick pass at alternate reference types