Tweak the strong typing and IDEA updates based on Marcin's feedback.