Fix my own complaints.

Clean up a few of the things discussed, including the error code for the failure scenario.