Minor polish in API Component Framework