Switched to bound functions where needed.