Some G-code flavor logic simplification