Avoid changing implicit subject altogether and eliminate deprecation warning

Improves #12 and #15 based on Myron's feedback.