Issue #8: Some clean-up in the instruction sets implementation