Minor code cleanup. Warnings fixed for arm64.