Fix final_default handling, boolean does support NULL