Fix warnings in CanonicalScanner and InheritedCanonicalTest

[aSemy]

Fix minor warnings, including but not limited to:

• Unnecessary boxing
• 'null' is returned by the method declared as @NotNull
• Not annotated method overrides method annotated with @NotNull