A few more tweaks after mulling over Chef source

plus minor test cleanup.