[PATCH 07/12] Cleanup: avoid undefined shift operation