These where removed rather than moved by this change? They both are still valid, can you shift them below the #endif like you did with last_endpoint later on