Match ‘final’ and ‘override’ keywords (C++11)

Also add actual “storage” keyword to the scope name (both these and a few others).