Nixing harddep after more thought
Fixing @Optional decorators for MFR