Fix a few bugs that snuck in when generalizing from rack-core-data

Fixes are described in separate commit messages.