Merge pull request #49 from pkasting/main

Fix -Wunreachable-code-aggressive.