Merge "Improve return types in class MagicWordArray"