8 chars different plus many many instances of typeof. Thought was to merge this PR then do it in master. Yea or nea?