Minor code rearrangement
Minor code rearrangement

Krenair/restbase,wikimedia/mediawiki-services-restbase,cscott/restbase,eevans/restbase,wikimedia/restbase,gwicke/restbase,eevans/restbase,wikimedia/mediawiki-services-restbase,gwicke/restbase,d00rman/restbase,Pchelolo/restbase,inverno/restbase,inverno/restbase,milimetric/restbase,Krenair/restbase,Pchelolo/restbase,wikimedia/hyperswitch,physikerwelt/restbase,d00rman/restbase,cscott/restbase,wikimedia/restbase,physikerwelt/restbase,milimetric/restbase