Inlined some more short (1-2 statement) functions.