minor cosmetic cleanup, use macro instead of explicit check