qapi: Simplify code a bit after previous commits