Cleanups: Minor simplifications in User API code