AS7-3772 Cleanup up interface criteria expression resolution