Never make argument-less functions instantiated
Prevent a few cases of pointless instantiation
Remove unused variable