Use fail instead of raise.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Remove useless braces.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>