Minor polish and a test-case to get out in the corners of param-tweaking