Fix increment/4 guards