[Planning] Done.
[Code Clean] Dead code elimination.
[GCC 4.6] Compare strong enums properly.