Clean-ups found during review of PR #43
Merge pull request #44 from phaller/topic/cleanup-43

Clean-ups found during review of PR #43