[issue31421] clean up >> and >>= macros and use macro bundles to simplify everything drastically