Additional declaration tweaks based on a few more test inputs