Remove a redundant static if
Remove another redundant static if
Merge pull request #25 from lgvz/static-if

Two static ifs