Hopefully more fixes than bugs, but these have been annoying CI and users for yonks (the ilk-m has been known for a few _years_, but only recently did CI start to pick up on the error and now refuses to run on ilk-m because of it). -Chris