Cleaned up a few methods in Foundation. (#289)