Agreed, they are.  Can I fix them in another PR though please?