Napalm in the morning. Fixes #185. Fixes #186.