Use braces in if-else
Add some more static asserts for random access