Fix ifdef/block nesting in command queue constructor