Minor fixes: use implicitly unwrapped optionals and make all extensions internal